A
Merge branch 'master' of https://github.com/mcho421/OnlineAuction.git

Conflicts:
	OnlineAuction/WebContent/Login.jsp