Old
Merge branch 'master' of https://github.com/BankOfRaymond/MakesYouSmarter

Conflicts:
	main.py
Before major overhaul
Housekeep