css repair 1
ui testing
Fixed UI tests
fix now
Merge branch 'master' into cssRepair

Conflicts:
	app/controllers/studygroups_controller.rb
Merge branch 'cssRepair'
Merge branch 'master' of https://github.com/dkumar/MeetMyClassmates

Conflicts:
	app/controllers/studygroups_controller.rb
	app/views/layouts/application.html.erb