added FG to rspec config
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
added user activities
created contexts for login and signup
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
initial test for each describe
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
edited sessions controller and ability model -Talked w/ Shadi
local commit
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/ability.rb