Can now display a form for owner to set discount price for specific room
type for specific hotel location.
Merge branch 'master' of https://github.com/sphan/COMP9321.git

Conflicts:
	Assignment 2/src/edu/unsw/comp9321/jdbc/DAO.java