remove old merging remains
Merge branch 'master' of http://github.com/thhomas/itag

Conflicts:
	README.md