Commit before merge with the master branch and report all development since the beginnig of work in others work station
resolving conflict
Commit before merge with the master branch and report all development since the beginnig of work in others work station
Merge branch 'SharingStation' of https://github.com/muirgen/encyclopedia-cthulhiana.dev into SharingStation