Updated time and place
Merge pull request #2 from HackSI/update

Updated time and place