Gathered files
Merge branch 'master' of https://github.com/filipallberg/5DV104
Cleaning up working directory