Begin CAPYBARA test
Merge branch 'master' of https://github.com/emoc11/music_event

Conflicts:
	app/views/users/index.html.erb
	spec/models/user_spec.rb