Added Jobs controller and views
Added Jobs controller and views
fixed merge conflict