first commit
Merge branch 'master' of https://github.com/lilgorilla/amoire

Conflicts:
	README.md