changes made by holmes

-Includes Wicha Calendar