ABarnhard/celebridate — pull request #7 by ABarnhard (2014-09-06 17:09:08+00:00)
Title: Merge

Resolved merge conflicts