Added toolbox.
Merge branch 'master' of github.com:oghm2/annotatr

Conflicts:
	html/test.html