test
Merge branch 'master' of https://github.com/Katsa/CS1002_EventCal

Conflicts:
	full-slider.html