Migrate class to main.h
Merge branch 'master' of https://github.com/Soleedus/CompSci-Final

Conflicts:
	main.cpp