added front end
lkj
ajsljsag
Added Search.java
minor fixes to User.java
Added roomify to search
Merge pull request #4 from mateoi/mateo

Mateo
asjifasg
login is working
asdf
Big commit
Merge branch 'master' of https://github.com/mateoi/bookaroom
dgsdg
attempt
changed requestBooking() to take in int room_id instead of Room
jasfasf
Merge pull request #5 from mateoi/mateo

changed requestBooking() to take in int room_id instead of Room
remove fetch
removing stuff Merge branch 'master' into sergiu

Conflicts:
	webapps/ROOT/WEB-INF/classes/HelloAndrew.class
	webapps/ROOT/WEB-INF/classes/core/AdminUser.class
	webapps/ROOT/WEB-INF/classes/core/CommonUser.class
	webapps/ROOT/WEB-INF/classes/core/Room.class
	webapps/ROOT/WEB-INF/classes/core/User.class
	webapps/ROOT/WEB-INF/classes/utils/DBAdapter.class
	webapps/ROOT/WEB-INF/classes/utils/DBAdapter.java
	webapps/ROOT/WEB-INF/classes/utils/LoginSystem.class
	webapps/ROOT/index.jsp