feedback partially done
corrected merge conflict
feedback fields full functional
ignore this and previous feedback view commits
merge conflict resolved
nonworking views
Student submission view can now see analitics. No error.
Analitics scores viewable by all.

Analitics values display properly in student overview, student submission, teacher submission view.
Created self.find_submission_and_status assignment model method

Moved logic relating to finding a student user's submission and that submission's status. Returns the completed submission. If none exists then @completed_submission is nil.
Created Assignment.create_submission_data

Moved controller logic for submission and submission placeholder creation into Assignment model. Logic is held in self.create_submission_data which returns a hash containing the submission object and the submission title and content placeholders respectively. Placeholders will populate the editor if the submission has not been marked complete.
Refactored Assignment model's self.find_submission_and_status method

No change in functionality, but the refactored version is more readable and clean.
updated views with feedback
Refactored Assignment model's self.create_submission_data method

Also made some small changes self.find_submission_and_status for readability and Ruby convention.
refactored the overview page for student and teacher view
Merge branch 'master' into feedback_views
starting userscontroller refactoring
Merge branch 'master' into css2
Merge pull request #63 from whoisglover/css2

Css2
Merge branch 'master' into feedback_views
Fix for login partial not showing invalid credentials error