Merge branch 'master' of https://github.com/KarooKoin/WordWar

Conflicts:
	css/style.css
rien