merge
merge
Merge branch 'master' of https://github.com/Katsa/CS1002_EventCal
Merge branch 'master' of https://github.com/Katsa/CS1002_EventCal
sample.php
Merge branch 'master' of https://github.com/Katsa/CS1002_EventCal