fixed conflict
Merge branch 'master' of https://github.com/marynelv/ACRLHw5-DStar
Merge branch 'master' of https://github.com/marynelv/ACRLHw5-DStar
added latest report