stage2 nearly complete
merge
Merge branch 'master' of https://github.com/MichiK91/VSLab1