merge
merge
Merge branch 'master' of
https://github.com/Quasineation/cabinwebproject.git

Conflicts:
	WebContent/search.jsp
Merge branch 'master' of https://github.com/Quasineation/cabinwebproject.git
Merge branch 'master' of
https://github.com/Quasineation/cabinwebproject.git

Conflicts:
	WebContent/search.jsp
merge
merge
Merge branch 'master' of
https://github.com/Quasineation/cabinwebproject.git

Conflicts:
	src/no/uib/info216/cabinwebproject/dao/CabinDao.java