Initial commit
Code provided by instructor
Merge branch 'master' of https://github.com/madmott/6s096-nbody
Hope this doesn't break everything
Merged and 'fixed' conflicts
Added gitignore file
Updated gitignore
Removed unnecessary files
Merge pull request #2 from madmott/jr_testing

Added correct git ignore
Merged with master