some changes
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
added doc directory with javadoc
testing some elastic search stuff
Merge pull request #56 from ibarreto/master

generated javadoc, also testing some elastic search stuff