first
Merge branch 'master' of github.com:darkobodnaruk/koinyo-server

Conflicts:
	.gitignore