progress on download and other stuff
Merge branch 'master' of https://github.com/davidzallen/cen3031

Conflicts:
	.DS_Store
	meanjs/.DS_Store
	meanjs/app/.DS_Store
	meanjs/app/controllers/.DS_Store
	meanjs/app/controllers/courses.server.controller.js
	meanjs/app/controllers/pdfGenerator.server.controller.js
	meanjs/app/routes/pdfGenerator.server.routes.js
	meanjs/public/modules/courses/controllers/outcomeAssessment.client.controller.js
progress on outcomes
Merge branch 'master' of https://github.com/davidzallen/cen3031

Conflicts:
	meanjs/public/modules/courses/views/CourseOutcomeAssessmentForm.html