Auto Commit - Sun May 18 11:50:49 EDT 2014 (Bahamut)
Merge remote-tracking branch 'origin/master'
Getting a recipe for the calendar working