Modifed code from lab before merge from home.
Merge branch 'master' of https://github.com/kchow3/as1

Conflicts:
	src/es/softwareprocess/as1/CounterController.java
Fixed weird bug that made stats loop until out of memory.
Finishing uo documentation