qwreq
Merge branch 'master' of https://github.com/Isantipov/HotScroll

Conflicts:
	src/HotScroll.Client/HotScroll.Client/HotScroll.Client/game.html
	src/HotScroll.Client/HotScroll.Client/HotScroll.Client/js/default.js
	src/HotScroll.Client/HotScroll.Client/HotScroll.Client/js/game.js
rhrw
Merge branch 'master' of https://github.com/Isantipov/HotScroll
sfgdshsd
Merge branch 'master' of https://github.com/Isantipov/HotScroll

Conflicts:
	src/HotScroll.Client/HotScroll.Client/HotScroll.Client/js/default.js
ghgfjf