hej
hej
Merge branch 'master' of https://github.com/hyber1z0r/CA-4-MEAN

Conflicts:
	server/dataLayer/datalayer.js
kk
Merge branch 'master' of https://github.com/hyber1z0r/CA-4-MEAN

Conflicts:
	server/dataLayer/datalayer.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/ExpressAngularSeed.iml
Added the factory