added gameplan for dealing with merge process (part of the next layer of errors, resulting from our low-level change to the engine. It needs to be resolved quickly (and given careful consideration) before we can move on).
Merge branch 'master' of github.com:khwillia/repss