here come the conflicts
Merge branch 'master' of github.com:/logmein3546/turbo