update
solved conflict
t push origin masterMerge branch 'michaelbyrd-master'
Fixed but on duplication of status method
Added styling to students assignmnent view
added review for teacher in assignments show
morning update
Merge remote-tracking branch 'upstream/master'
assignment view if