First commit
Merge branch 'master' of github.com:slygent/testapp

Conflicts:
	.gitignore