Merge pull request #1 from jamcohen/jake

Jake
finished adding dishes
finished adding dishes
Added full calender support