add devise migration
still working on devise
merged master to devise
leaving devise for now
cancan ability implemented; new user role set to registered
fixed merge conflicts
fixed cancan ability.rb
merged master on manipulate
edit comments controller and changed photo show view to have a comments form
nested comments under photos in the routes
 adding ability for photo wall
changed paths to comment on photos; comments functioning
changed validation for comments
 modified the user controller, create views for devise, delete the old stuff in layouts application
fixed voting error when not logged in as a user
fixed conflicts with master
photo album edit buttons not working for cancan ability
modified cancan abilities to fix logged out person
fixed cancan
merged master on cancan branch