change
Merge branch 'master' of https://github.com/mcho421/OnlineAuction.git
totally changed the database.
Nearly finished offering an item.
"Nearly" means there is an error that i dont know how to deal with.
After save the file in the sever.
can not do anything with beans.
Forgot to add files into index last time commit.
Merge branch 'master' of https://github.com/mcho421/OnlineAuction.git

Conflicts:
	OnlineAuction/WebContent/WEB-INF/web.xml