first commit.
f*ck this github
Merge branch 'master' of github.com:welyjesch/angulartest

Conflicts:
	README.md