Temp
Merge branch 'master' of https://github.com/DAHeath/CS3300-Senior-Design
Added jquery-ui to vendor/assets/javascripts and updated gemfile.