Fixed a method in ES helper and change
Merge branch 'master' of ssh://git@github.com/jessicayuen/CMPUT301T13.git