Uploading the elasticsearch progress
More changes to elasticsearch stuff before branch merge
Merge branch 'master' of https://github.com/CMPUT301F13T01/CreateYourOwnAdventure