gxc
Merge branch 'master' of https://github.com/sanzodown/clickerz

Conflicts:
	css/stylesheet.css
	index.html
	js/script.js