[new] timer and show picture
Merge branch 'master' of https://github.com/HackPrincetonTeamHTHS/ElderScrollsClient
Merge remote-tracking branch 'origin/master'