Merge pull request #3 from CMPUT301F14T03/elasticSearchDev

Elastic search dev