Tim fails at things usually.

I didn't make too much progress but I thought I'd push.
Merge branch 'master' of https://github.com/Kaybass/CSI-281-Final