とりあえず
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/views/bookmarks/user_bookmarks.html.erb
更新Ajaxサンプル