classpath to merge
Merge branch 'master' of https://github.com/arthurchang/RaiseYourHand

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/arthurchang/RaiseYourHand
Much of the local server end stuff done, along with minor changes in login and admin stuff.