initial commit
Merge branch 'master' of https://github.com/jaysonlarin/test_app

Conflicts:
	.gitignore