Added Windows guide GitBash
removed merge conflict
windows-guide updated by roger
 Please enter the commit message for yur changes. Lines starting
update '' by roger
bla
Merge branch 'master' into windows-guide

Conflicts:
	Gemfile
	README.md
Merge pull request #41 from koelncampus/windows-guide

Added Windows guide GitBash