Merge branch 'search'
Merge branch 'v2' of https://github.com/yeaz/dancespace

Conflicts:
	app/controllers/home_controller.rb
	app/models/studio.rb
	app/views/events/index.html.erb
	app/views/home/_navbar.html.erb
	app/views/users/index.html.erb
fixed conflict for merging v2 and master
fixed conflict with develop
uncommented pg
uncommented pg
changed Gemfile.lock
removed mysql2
added mysql2
fixed conflict in Capfile
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
removed second person call