Presentation Update
Merge branch 'master' of https://github.com/rbrockman2/comp502-physics

Conflicts:
	.DS_Store