Create TODO.txt
Fixed syntax and formatting, runs now
Merge branch 'master' into working

Conflicts:
	joy.py
	main.py
Cleaned up after merge, changed some formatting to align with PEP8, fixed some syntax issues