Merge pull request #1 from colinfrei/solution

Add some tests
Merge branch 'solution' of github.com:nicam/angular-workshop into solution