i don't remember what i changed
merge conflict?
Merge branch 'master' of https://github.com/ireardon/cs32-final
Merge branch 'master' of https://github.com/ireardon/cs32-final
updated TODO