Added smile on windows
Hand made merge on windows
Merge branch 'master' of https://github.com/artemyl/learngit