Initialize repository
Update Gemfile.lock
Add precompiled assets for Heroku
Merge branch 'master' of https://github.com/kurokocon/testApp

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