basic changes
Merge branch 'master' of https://github.com/Arkessler/Prog5