no message
Merge branch 'master' of https://github.com/ThomasWilhelmSybit/angularjslabday

Conflicts:
	services.js