stuff
Merge branch 'master' of github.com:schleary/p-patch-Salmon
rspec and some responsive stuff