Testing pre-commit
Testing pre-commit hook
Testing pre-commit
Testing pre-commit hook
Angular base services
Pre-commit git hook
Merge branch 'master' of github.com:sbedulin/pro-angularjs-book

Conflicts:
	app/index.html