changed name
Merge branch 'master' of https://github.com/getflourish/amonit-

Conflicts:
	id.txt