added manage outcomes
merging updated build
Added term/year
Added administrator/user roles
pulling
Merge branch 'master' of https://github.com/davidzallen/cen3031

Conflicts:
	meanjs/.DS_Store
added paths
Merge branch 'adminRoles'

Conflicts:
	meanjs/app/tests/modelTests/user.server.model.test.js
	meanjs/node_modules/express/node_modules/send/node_modules/on-finished/node_modules/ee-first/LICENSE
	meanjs/node_modules/express/node_modules/send/node_modules/on-finished/node_modules/ee-first/index.js
	meanjs/node_modules/json2xls/node_modules/excel-export/example/node_modules/express/node_modules/connect/node_modules/qs/.gitmodules
	meanjs/node_modules/json2xls/node_modules/excel-export/example/node_modules/express/node_modules/connect/node_modules/qs/Readme.md
	meanjs/node_modules/json2xls/node_modules/excel-export/example/node_modules/express/node_modules/mkdirp/.npmignore
	meanjs/node_modules/json2xls/node_modules/excel-export/example/node_modules/express/node_modules/mkdirp/examples/pow.js
	meanjs/node_modules/phantom/.npmignore
	meanjs/public/modules/courses/config/courses.client.config.js
	meanjs/public/modules/courses/controllers/courses.client.controller.js
Testing tests
Merge branch 'master' of https://github.com/davidzallen/cen3031
New style LOTS of cool changes!
Conflicts:
	.DS_Store
	meanjs/.DS_Store
	meanjs/public/modules/courses/config/courses.client.config.js
	meanjs/public/modules/courses/views/list-courses.client.view.html
ok:wq
new readme
Merge branch 'master' of https://github.com/davidzallen/cen3031

Conflicts:
	README.md
pushing
Merge branch 'master' of https://github.com/davidzallen/cen3031

Conflicts:
	.DS_Store
	meanjs/.DS_Store