Initial commit
Merge branch 'master' of github.com:pr0digy-/first_app

Conflicts:
	Gemfile
	config/initializers/secret_token.rb