small changes
Merge branch 'working' of https://github.com/MacintoshPrime/ToDo into working

Conflicts:
	Static/js/code.js
cleaned up some things