Update README.md
Merge remote-tracking branch 'origin/master' into angularjs-style-guide

Conflicts:
	README.md