m
Merge branch 'master' of github.com:mateoi/bookaroom
aslkafa
m
merge
m
change
Merge branch 'master' of https://github.com/mateoi/bookaroom

Conflicts:
	webapps/ROOT/WEB-INF/classes/core/User.class
	webapps/ROOT/WEB-INF/classes/utils/DBAdapter.class
m
m
stuff
Merge branch 'sergiu'

Conflicts:
	webapps/ROOT/RoomBrowse.jsp
m
Merge branch 'master' of github.com:mateoi/bookaroom
login system added
added binaries
added stuff