Fixed javascript include issue
Fixed conflict in Gemfile.lock
Merge pull request #142 from uidaho-bsn/pierce-dev

Fixed javascript include issue