removed temp comment in Gemfile; refreshed gems
Fixed app/assets/javascript/application.js during rails s
updated gems
Merge pull request #118 from jasnow/master

 Fixed app/assets/javascript/application.js so "localhost:3000" works during "rails server".