Dylans branch

Added @import bootstap to application.css . It looks like I changed the Gemfile.lock as well which might be a problem....