initial commit
Merge branch 'master' of github.com:matcho3/NewAoba

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml
Merge branch 'master' of github.com:matcho3/NewAoba
Merge branch 'master' of https://github.com/matcho3/NewAoba into question
fixed
Merge branch 'master' of github.com:matcho3/NewAoba
fixed
fix
Merge branch 'question' of github.com:matcho3/NewAoba
fix