Merged
Merge branch 'master' of https://github.com/rlbailey/Project-6.git

Conflicts:
	PartOne/main.cpp
Fixed syntax errors.