First commit
Merge branch 'master' of https://github.com/ChaKon/Masters-project