cancan ability implemented; new user role set to registered
fixed merge conflicts
fixed cancan ability.rb
merged master on manipulate
Working on masonry
 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
merged comments with master
added cancan for the comment
edit delete link on comments
Fixed weird act_as_votable nil bug
Merge
Merge branch 'master' into comments
Merge branch 'master' into comments
added delete link on comments