Touched up globalClasses.
Merge branch 'master' of https://github.com/cs2103aug2014-t7-2/main

Conflicts:
	globalClasses/ezC.java
Finally fixed more conflicts. Cleaned up a few things.