Did somethign
Merge branch 'master' of github.com:jwraats/schoolProject-Knocking