removed .classpath from index
Merge remote-tracking branch 'origin/master'
fixed typo in userindex.jsp

Also removed .classpath from index
setting up JNDI
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineAuction/.classpath
	OnlineAuction/WebContent/UserIndex.jsp