Merge pull request #46 from brandonkwong/dalton

gemfile
Updated gemfile
fixed rails s bug