cancan ability implemented; new user role set to registered
fixed merge conflicts
fixed cancan ability.rb
merged master on manipulate
 adding ability for photo wall
fixed voting error when not logged in as a user
fixed conflicts with master
photo album edit buttons not working for cancan ability
fixed cancan
merged master on cancan branch