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

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	bin/rails
	bin/rake
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	public/404.html
	public/422.html
	public/500.html
	test/test_helper.rb
.
.