Combined Task and Assignment columns
Recommented current_user
Merge branch 'task_assg' into staged
Refactored spec to use combined task/assg