Renamed main.html to codeclock.html
Timestamping
Merge branch 'develop'