adding some part of the brach
added some conflicts
added cancan to user, album and photo - waiting for comment and refactoring
auth stuff
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
added amazon and votes
added authorizations finished (comment cancan include)
seed deleted
Merge branch 'chore/authorizations' into dev
added vote authorization