Initialize repository
Initialize repository
aMerge branch 'master' of https://github.com/bhscream/first_app

Conflicts:
	Gemfile.lock
	config/initializers/secret_token.rb