Added grades files
Merge branch 'view_course_page' of https://github.com/dhm116/ArchAngel into grades
grade route commented out to debug
Merge branch 'grades' of github.com:dhm116/ArchAngel into grades
adding files for assignment and submission.  moved location of grade files.
Updated name of AssignmentSubmissionController
Updated name of AssignmentSubmissionController.
Moved assignment outside lesson.
Updated main require to reflect file structure updates.
Assign. reorg. files did not commit?
Merge branch 'grades' of github.com:dhm116/ArchAngel into grades
Merge branches 'edit_course' and 'grades' of https://github.com/dhm116/ArchAngel into grades
Updates to view assignments, navigate to assignment page, view grades.
Merged grades and edit_course
Working on edit assignment and lesson functionality.  Having an issue with lesson page loading.
Merge branch 'grades' of github.com:dhm116/ArchAngel into grades
Merge branch 'master' into grades
Added edit-assignment.jade file.
Merge branch 'master' of https://github.com/dhm116/ArchAngel into grades

Conflicts:
	mimosa-app/assets/javascripts/app/course/course-main.jade
	mimosa-app/assets/javascripts/app/course/lesson/view-lesson.jade
	mimosa-app/assets/javascripts/main.coffee
Merge branch 'grades' of github.com:dhm116/ArchAngel into grades