added TODOs
Merge branch 'master' of github.com:stucco/bookmarklet

Conflicts:
	server.js