specs for user model
Spec for user.rb
Merge remote-tracking branch 'upstream2/master'

Conflicts:
	spec/models/ability_spec.rb
Spec for ability.rb
more specs for ability.rb
more specs for ability.rb
more specs for ability.rb
add .idea/ to gitignore
Spec for organizer in user_spec.rb
fixing git screw up
Spec for supervisor in user.rb
git pull any changes
Correct indentation of ability spec
Add indentation to ability spec
Remove line from spec
spec for application.rb
Spec for submission.rb
Spec for submission.rb
spec for rating.rb; sad case
Sad case specs for rating_spec.rb