Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

* develop:
  Use absolute references to the project url
  Fix the date format in the json data file.
Merge branch 'develop'

* develop:
  Fix the base url.
Updated README.md
Updated _config.yml
Merge branch 'develop'

* develop:
  Update the jekyll configuration.
  Add the baseurl option to the config file.
  Fix some preferences.
Merge branch 'master' of https://github.com/pnavarrc/earthquake

* 'master' of https://github.com/pnavarrc/earthquake:
  Updated _config.yml
  Updated README.md

Conflicts:
	_config.yml
Merge branch 'master' into develop

* master:
  Updated _config.yml
  Updated README.md