committing to get latest code
I believe the only merge conflict was in the binary. Should now be able to pull
Merge branch 'master' of https://github.com/jeshuamaxey/comp-phys

Conflicts:
	project-b/project-b

Attempting to commit file merge