Merge pull request #1 from UoYCS-plasma/dev

Merge dev into master
Merge branch 'dev'
Create README.md

This resolves issue #2
Merge pull request #3 from UoYCS-plasma/master

Get README from master