Initial Commit
Merge http://github.com/louiecvdev/sample_app

Conflicts:
	.gitignore