Merge branch 'master' of https://github.com/LuanWH/cs2102-booking-system

Conflicts:
	cs2102/searchTicket.php
我TM居然conflict了
Final Report Updated
Movie of the Year added