Refactored ES into its own package, did some javadoc
Merge branch 'master' of https://github.com/CMPUT301F14T05/CorgFu