adds basic timer functionality
fix conflicts

Conflicts:
	game.html
	js/main.js
Merge branch 'master' of https://github.com/pilliq/webscraper
Merge branch 'master' of https://github.com/pilliq/webscraper
ongoing efforts in win conditions and crumbling
Merge branch 'master' of https://github.com/pilliq/webscraper

Conflicts:
	game.html
crumbling now working!