adjustments
Merge branch 'master' of https://github.com/a7drew/Stumptown40