changed syntax and added bootstrap-sprockets
Merge branch 'modal-hackathon'