first commit
Merge branch 'master' of https://github.com/peteraleksa/cisc3650-angular-demo

Initial merge