Add bootstrap JS and CSS, rearrange requirements in layout.erb so our CSS is loaded last (and not clobbered by bootstrap), starting to work on a loading message
Fix merge conflict in style.css