Major work done on the calendar
Merge branch 'master' of https://github.com/cricket007/CSSE230--Facebook.git
Made a change to avoid git troubles