之前写的忘了这是什么了
Merge branch 'master' of https://github.com/null09264/CS2102-Project

Conflicts:
	Source Codes/available_slot.php