test Codeship again
Merge branch 'staging' of https://github.com/stanleyfurniture/codeshiptest into staging