TestApp initial commit
Initial commit
Merge branch 'master' of github.com:ardiwine/TestApp

Conflicts:
	.gitignore