Update
Merge branch 'master' of https://github.com/avosalmon/angular-seed

Conflicts:
	README.md