conflict res 1
resolved.
conflict resolution
Merge branch 'master' of https://github.com/XepherX/SMURT