after meeting
deleted the git merge stuff it added >:O
Merge branch 'master' of https://github.com/MetalFaceDev/unihub
converted viewalllistings to a jsp. added a search bar in it
add the jsps and session for amazon search
Merge branch 'master' of ssh://github.com/MetalFaceDev/unihub

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Added a jsp for the book not found error at amazon search
decided to just keep using session to track last known URL but seperated the jsp part to a single include file
tried to fix web.xml conflict
implemented twitter bootstrap. cleaned up jsps
Merge branch 'master' of https://github.com/MetalFaceDev/unihub
fixed git merge stuff that was put in web.xml again
fixed some stuff on view all listings that was quirky
profile jsp working