init app
Merge branch 'master' into test

Conflicts:
	.gitignore
	README.md