Not sure what I changed...
Merge branch 'master' of https://github.com/burkel24/OS2

Conflicts:
	main.cpp