Did some premature merging
Merge branch 'master' of github.com:greysonp/tamagetitdone

Conflicts:
	js/tgd.js
	js/timer.js