karma.conf added
conflicts resolved and changes accepted
additional changes accepted
Changes committed
Merge branch 'develop' of https://github.com/andela-taderinola/angularMenace into develop
Merge branch 'develop' of https://github.com/andela-taderinola/angularMenace into develop
Merge branch 'develop' of https://github.com/andela-taderinola/angularMenace into develop
Added XHR Requests with tests