adding a bunch of bootstrap 3 stuff as the gem generally don't keep up
Merge branch 'master' of github.com:dougscheirer/phdog-db

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/_header.html.erb
	app/views/search/index.html.erb
	config/routes.rb
fixup from merge; remove old bootstrap files, update Gemfile.lock