angular-mocks
solving conflict in the index file
trying to resolve conflict
Merge branch 'master' of https://github.com/gudmundurste12/Prog3