- merge commit
Merge branch 'master' of https://github.com/Bergx2/boatopoly2.git

Conflicts:
	assets/css/main.css