initial setup
Merge branch 'master' of github.com:sandropaganotti/annotate

Conflicts:
	LICENSE