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
Working on getting buttons on bottom of search_results page
Added buttons to bottom of search_results page.
Changed order of fingering info at bottom of results page per Susan's specifications. Closes bug #110
Fixing conflicts on checking for notice from last commit
Cleaned up fingerings_controller from last commit a little before merging
Fixing possible log error in search_results view.
Fixing some potential logic bugs in views, removing 'fingerings is approved/disapproved' heading when displaying a note to a nonAdmin. Fixing minor issues related to Pierce's most recent changes.
Merge pull request #147 from uidaho-bsn/ryan-dev

Ryan dev (Changes made by Pierce plus some minor improvements)