timer updated
Merge remote-tracking branch 'upstream/master'
menu added to index.php
Merge pull request #26 from rishy/master

timer updated