week 3 stuff
Merge branch 'master' of https://github.com/icy-wolf/tc349
confused... hopefully it will work
got it to work stuff