Edits to code

Sunday April 14
Merge branch 'master' of https://github.com/rbrockman2/comp502-physics