finished the settings component
Merge branch 'master' of https://github.com/hawkrives/svg-diplomacy

Conflicts:
	app/components/game/settings.js
	app/views/game.js