Base Commit
Merge branch 'master' of github.com:abhisekp/AngularJS-Template

Conflicts:
	README.md