ABarnhard/celebridate — pull request #13 by ABarnhard (2014-09-07 22:48:33+00:00)
Title: Megamerge

Merged gifts & proposals and editProfile locally to resolve merge conflicts