Booking system
test
Merge branch 'master' of https://github.com/gagallo7/COMP9321.git

Conflicts:
	Assignment2/build/classes/edu/unsw/comp9321/model/UserLogin.hbm.xml
	Assignment2/src/edu/unsw/comp9321/control/RegisterUserCommand.java
	Assignment2/src/edu/unsw/comp9321/dao/DerbyMovieDAO.java
Merge branch 'master' of https://github.com/gagallo7/COMP9321.git