Initial Commit
Merge branch 'master' of git://github.com/mthebert/first_app

Conflicts:
	.gitignore