base commit
Merge branch 'master' of https://github.com/mahees/emerlet

Conflicts:
	.gitignore