Reports 1 and 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/uci/ics/sdcl/firefly/servlet/SkillTestServlet.java
	src/edu/uci/ics/sdcl/firefly/servlet/UserIdServlet.java
Revert "Reports 1 and 2"

This reverts commit e6e144a630f7eb7e8eeff5a24c9f88e19adc7dda.

Conflicts:
	src/edu/uci/ics/sdcl/firefly/servlet/SkillTestServlet.java