start adding questions
some code to start adding questions, not code for answers yet
adding bootstrap, a lot of changes to authentication that aren't good
move files from public to app/assets
add bootstrap tabs, bootstrap gem
add bootstrap gem, bootstrap tabs
Merge branch 'master' of github.com:davidrhoden/rnrmatchbook

Conflicts:
	app/models/user.rb
	app/views/users/show.html.erb
	db/schema.rb
remove requirement for bootstrap static
Merge branch 'questions'
correct bad reference to item.artist.artist_name, fix uncleared divs, find lost <% end %? and fix.
fix illegal css
 restore the automatic adding of new artists
Merge branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/custom.css
	app/views/pages/home.html.erb
	app/views/shared/_likestats.html.erb
	app/views/shared/_stats.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/schema.rb
	public/stylesheets/blueprint/screen.css
Merging
conditionals in migrates
Syntax error fixes
user_info is a partial taking user as input
Testing cleanup
Restored code that was working before.
Closing div