設定
bootstrap
Merge branch 'master' into HEAD

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
delete unnecessaly files
add devise user