Initial commit
Merge branch 'master' of github.com:bwdevel/first_app2

Conflicts:
	.gitignore