Added code to the project
Merge branch 'master' of https://github.com/steinsholt/Master-Thesis