change
Merge branch 'master' of https://github.com/raymondtsung/idea-jackpot

Conflicts:
	css/style.css