add things to todo
Merge branch 'master' of http://github.com/joetait/websites

Conflicts:
	personal_sidebar/todo