Fixed javascript include issue
Fixed conflict in Gemfile.lock
Merge branch 'dev' of https://github.com/uidaho-bsn/BFF into pierce-dev
fixing jquery fix conflict when merging
in-progress of adding buttons to bottom of search_results
accidental merge fix