Killed redundant instance variables in users controller. Added status column to the order show table
Added completed status notification
deleted params.inspect on order page
fixed merge conflict