first commit
Merge github.com:satyap/annotate

Conflicts:
	README.md