i hate gemfile
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon