fix .classpath
Added a contact info view and more to the main page
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
preference
files should be up to date.