initial commit
Merge branch 'master' of github.com:jsahleen/sample_app2

Conflicts:
	.gitignore
whatever