Gemfile updated
jQuery UI functionality added
merge conflict
routes etc updated
Bootstrap suppport added