Merge branch 'master' of github.com:joetravis/angular-grunt-karma-coverage-seed into protocol

Conflicts:
	app/index.html
Merge pull request #9 from joetravis/libChange

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