Merge remote-tracking branch 'origin/John's-Branch' into Maegans_Branch

Conflicts: src/jat/examples/ThreeBodyExample/ThreeBodyExample.java
mxd12001 · Dec 5, 2015 · da3495f · da3495f
2 parents 9428b96 + 9fd3337
commit da3495f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 140 deletions.
diff --git a/src/jat/examples/ThreeBodyExample/ThreeBodyAPL.java b/src/jat/examples/ThreeBodyExample/ThreeBodyAPL.java
diff --git a/src/jat/examples/ThreeBodyExample/ThreeBodyExample.java b/src/jat/examples/ThreeBodyExample/ThreeBodyExample.java