another conflict from seth pc
Merge branch 'master' of https://github.com/imeQ/gittest.git