adding ability
adding ability
Merge branch 'master' of github.com:emmaviolet/photo_sharing_app

Conflicts:
	photo_sharing_app/app/models/ability.rb