Committing to pull.
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Control/CommonHeader.h