Smth
Smth
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
	img/overlay.png
	img/ticket_lose.png
	img/ticket_win.png
	index.html
	js/main.js