Initial commit
Merge branch 'master' of github.com:expertyk/app

Conflicts:
	.gitignore