first commit
Merge branch 'master' of https://github.com/nbarishok/imin-server

Conflicts:
	.gitignore