Merge branch 'master' of github.com:colbydehart/when

Conflicts:
	app/views/edit.html
	todo.md