updated and merged with drew
Merge remote-tracking branch 'josh/master'
working on contact info view
Merge remote-tracking branch 'josh/master'
edited and added contact info things
Merge remote-tracking branch 'Alana/master'

Conflicts:
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/RPC.java