.
Merge branch 'master' of https://github.com/whyplay/main

Conflicts:
	static/css/custom.css