fixing build error on last merge; updated readme for windows and ubuntu conflict
Merge branch 'master' of https://github.com/Yarl-IT-Hub/ySchool