added jquery
merged and up to date
fixed some issues with merge conflicts (first attempt)
Merge pull request #18 from zrivest/jquery_merge_check

fixed some issues with merge conflicts (first attempt)
added associations changes to allow for a course to see a particular student's assignment
Merge branch 'master' into edit_course_page

Conflicts:
	app/models/course.rb
Merge pull request #20 from zrivest/edit_course_page

added associations changes to allow for a course to see a particular stu...
fixed missing end issue in course controller
Merge pull request #21 from zrivest/edit_course_page

fixed missing end issue in course controller
fixed merge conflicts check routes to edit
WIP: implementing user_courses controller; and moved edit action and view to user_courses
used all_students method in groups model instead of students to find current students for that class