redo DB
Merge branch 'master' of https://github.com/joshbeam/Whiteboard

Conflicts:
	todo(1).sql