AngularJS addition
Merge branch 'dev' of https://github.com/bdwellons/abj-group-project into dev