Added platform documentation
Resolving conflicts
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:horizon-institute/artmaps