stuff
console.logs were removed in a lot of places
Merge branch 'master' of https://github.com/bsansouci/React---Shipwars

Conflicts:
	NEWsrc/Components/MainView.react.js
asdf