angular add
Merge branch 'master' of https://github.com/GeneralDoddi/veft-skil-3

Conflicts:
	kodemon/NodeServer/server-api.js