Merge branch 'master' of github.com:joetravis/angular-grunt-karma-covera...

...ge-seed into protocol

Conflicts:
	app/index.html