Get karma tests working
Merge branch 'master' of github.com:ConnorAtherton/angular-hackathon

Merge