bundle update on mac
conflict resolved
Merge branch 'master' of github.com:sheldondyck/jobspageio_app
Merge branch 'master' of github.com:sheldondyck/jobspageio_app