committing ability tests with some remaining bugs
Merge branch 'chore/specs_for_ability' into dev
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
broken conflict
Merge branch 'master' into dev