Minor fix views + maj config gemfile.lock
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/controllers/users_controller.rb
Merge branch 'master' of https://github.com/emoc11/music_event

Conflicts:
	app/controllers/users_controller.rb