Merge pull request #4 from mplaza/melabranch

readding the authorization stuff
Merge pull request #5 from mplaza/melabranch

role_id successfully saved
Merge pull request #6 from mplaza/melabranch

user relationships and cancan integration
Merge pull request #7 from mplaza/melabranch

resident controller and testing
Merge pull request #8 from mplaza/melabranch

some bbasic view setup
Merge pull request #9 from mplaza/melabranch

Melabranch
donors controller done
trying merge
Update Gemfile.lock
gem merge
Merge pull request #10 from mplaza/dummypay

donors controller done
after merge disaster