Initialize repository
Merge branch 'master' of https://github.com/yo-shi/first_app

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/application.rb
	config/boot.rb
	config/initializers/secret_token.rb
	public/robots.txt