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

Conflicts:
	NEWsrc/Stores/ObjectStore.js