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 pull request #9 from matcho3/database

fixed
Merge branch 'master' of github.com:matcho3/NewAoba
fix
Merge branch 'question' of github.com:matcho3/NewAoba
fix
fixed
fix
Merge pull request #11 from matcho3/master

Master