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

Conflicts:
	docs/presentation/ELEC502_Presentation.lyx
Merge branch 'master' of https://github.com/rbrockman2/comp502-physics