removing conflict file
Merge branch 'master' of github.com:bagvendt/SAD2_Project