fixed merge conflict
Merge branch 'master' of https://github.com/hutch78/art-4.us