Not sure
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS1C Class Project/main.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS1C Class Project/main.cpp