Merge branch 'master' of https://github.com/agazeley/CS172_Final_project

Conflicts:
	Final Project/Final Project.sdf
	Final Project/Final Project.v12.suo
	Final Project/Final Project/Final Project.vcxproj.filters

updated lang cpp and header
Merge branch 'master' of https://github.com/agazeley/CS172_Final_project

Conflicts:
	Final Project/Final Project.sdf
	Final Project/Final Project.v12.suo
	Final Project/Final Project/Final Project.vcxproj.filters