http
switching ng-min for ng-annote
updating package.json
Updating readme
adding link to style guide
Merge branch '11-firebase' of https://github.com/enspiral-dev-academy/angular-workshop into 11-firebase

Conflicts:
	package.json
Merge branch 'master' into 11-firebase

Conflicts:
	package.json