resolved conflicts
Merge branch 'master' of github.com:raitom/Contactissimo