moved js into rails js folder, deleted public folder
moved css into rails css folder, deleted public folder
separated concerns into different css, html, js files
removed unnecessary bootstrap link
removed unnecessary bootstrap link
removed unnecessary bootstrap link
changes made to resolve conflict
complete merge