tidying
Merge remote-tracking branch 'jheltzel/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/server/LoginServiceImpl.java
Merge remote-tracking branch 'drew/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java