first Carl commit

inevitable changes
Second commit
Merge branch 'master' of https://github.com/Software-Eng-Senanu-Carl/angular-classwork

Conflicts:
	node_modules/http-server/node_modules/ecstatic/node_modules/mime/package.json
	node_modules/karma/node_modules/connect/node_modules/fresh/package.json
	node_modules/karma/node_modules/connect/node_modules/qs/package.json
	node_modules/karma/node_modules/connect/node_modules/send/node_modules/range-parser/package.json
	node_modules/karma/node_modules/lodash/package.json
	node_modules/karma/node_modules/log4js/node_modules/readable-stream/package.json
	node_modules/karma/node_modules/mime/package.json
	node_modules/karma/node_modules/socket.io/node_modules/redis/package.json
	node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/builderror.log
	node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/package.json
	node_modules/protractor/node_modules/q/package.json
	node_modules/protractor/node_modules/request/node_modules/qs/package.json