cancan
update styles
fixing cancan
conflicts
Added readme
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
readme updated
style comments form
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
form update