Updating website with time & location
Merge branch 'master' into gh-pages