- 2st Template full
Merge branch 'master' of https://github.com/antoinerousseau/funnyworldcup

Conflicts:
	assets/style.css
Start add bet system
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/antoinerousseau/funnyworldcup

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html