gemfile.lock wont go away
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon
ignore
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon