d
Merge branch 'master' of github.com:marinamarina/annotiser

Conflicts:
	README.markdown