torpedoes
Merge branch 'master' of https://github.com/bsansouci/react-shipwars

Conflicts:
	NEWsrc/Stores/ObjectStore.js
Merge branch 'master' of https://github.com/bsansouci/react-shipwars