Initial commit
Merge branch 'master' of github.com:goys/sample_appp

Conflicts:
	.gitignore