boh
Merge branch 'master' of https://github.com/barbecuesoft/wodrs
varie
dai
sucaa

Merge branch 'master' of https://github.com/barbecuesoft/wodrs

Conflicts:
	wodrs_fe/audio/ok.wav
diocane
Merge branch 'master' of https://github.com/barbecuesoft/wodrs

Conflicts:
	wodrs_fe/js/game.js
yo
yo
yo