fixing connection DBConn
Merge branch 'master' of https://github.com/pmsardes/ECE456

Conflicts:
	HotelDatabase/bin/DBConn.class
	HotelDatabase/src/DBConn.java
Fixing dbconn