merge conflicts
Forgotten commas and semicolons
Merge branch 'master' of https://github.com/Z1MM32M4N/marauder

Conflicts:
	client/marauder.css
Merge branch 'master' of https://github.com/Z1MM32M4N/marauder