finished prototype
Merge branch 'master' of github.com:gawecoti/Pangaea