colors
Merge branch 'master' of https://github.com/bsansouci/React---Shipwars

Conflicts:
	NEWsrc/Components/MainView.react.js