merge conflict
additional merge conflicts
Merge branch 'master' of github.com:mntj/JobBoard
Edit and update actions and views modified
merge conflict within user controller fixed
Merge branch 'master' of github.com:mntj/JobBoard
fix in edit action added, edit view is now fully functional