Update for UGentopoly
Merge branch 'master' into UGentopoly

Conflicts:
	assets/css/style.css
	assets/js/main.js
Merge pull request #1 from niknetniko/UGentopoly

Update for UGentopoly