Merge branch 'master' of https://github.com/tony-kerz/ng-test-1

Conflicts:
	README.md