dded timestampiing
Merge branch 'master' of https://github.com/jcadek/301project into jcadek-master

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/elasticsearch/ESHandler.java