Merge remote-tracking branch 'drew/master'
added basic layout of a main page view
Merge remote-tracking branch 'jake/master'

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

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
Fixed the errors