FINALLY making the associations work
Adding checkboxes and form_tag to courses table
Adding template for the form to which the selected classes are going to
Fixing merge conflicts
Updating the class edit pages (in order to checkout to branch) (although had to comment out the update_multiple method)
Commiting to allow for push to master