studentview
conflict resolving
added staffview and studentview
Merge branch 'master' of https://github.com/Yarl-IT-Hub/ySchool