Initial commit
Code provided by instructor
Merge branch 'master' of https://github.com/madmott/6s096-nbody
Merged and 'fixed' conflicts