Lots of tests and such
Merge branch 'master' of https://github.com/MissValeska/Yet-to-be-Named

Conflicts:
	main.cpp

omg conflicts