"solving" conflict in properties
Merge branch 'develop' of https://github.com/Bergmam/DAT255.git into develop