fixed nav bar and such
fixed merge conflicts
Edited new jobs form
Merge branch 'master' of github.com:latuprez/maid_app_final