mssa3demo

Merge pull request #2 from polichtm/bob-conflict

Resolve merge conflict in shared.txt

Bob adds his version of shared.txt

Merge pull request #1 from polichtm/alice-conflict

Alice adds her version of shared.txt