nothing...just want to pull
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Control/Control.h
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project
Changed InputParser and Control to create the objects correctly
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	input.xml