Conflict resolved
Merge branch 'master' of ssh://github.com/pykih/salestag