update
Merge branch 'master' of https://github.com/coniewt/CMPUT301W13T12.git

Conflicts:
	C301W13T12Recipes/src/ca/ualberta/c301w13t12recipes/model/ElasticSearch.java
	C301W13T12Recipes/src/ca/ualberta/c301w13t12recipes/model/ElasticSearchResponse.java