added rubyOnWin and modified readme
modified readme again
fixed conflict in readme
Merge branch 'master' of github.com:dochipo/Info3_Uebung1