Initialize repository
Merge branch 'master' of https://github.com/jmaniatis/first_app

Conflicts:
	.gitignore
	config/initializers/secret_token.rb