Made a events class, made event class, calender uses them now
Made a events class, made event class, calender uses them now
Merge remote-tracking branch 'origin/master'