Synchronize with actual online version
Merge branch 'master' of github.com:doomy/lmb-party

Conflicts:
	css/styles.css