new server
Merge branch 'master' of https://github.com/sanghack81/ist510sp2014

Conflicts:
	MoocBroker/src/edu/psu/ist/MoocServer.java
	MoocBroker/src/edu/psu/ist/MoocServlet.java