From windows
Merge branch 'master' of https://github.com/thoughtram/example-app