First commit
Merge https://github.com/ChaKon/Masters-project
First commit