merge commit
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing_amy
local commit
fixed stuff
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing
fixed problems
Merge branch 'master' of https://github.com/ysadka/sf_overflow into testing

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/ability.rb
fixed changes
fixed merge conflict
Merge branch 'login'
cleaned up gem file
Merge branch 'master' of https://github.com/ysadka/sf_overflow
added profile shit
added ability to edit and delete questions
rspec question views
Merge branch 'master' of https://github.com/ysadka/sf_overflow
added edit and delete ability
Y U NO WORK
adjusted nav links
moved form partials