Fixed function type fuck ups
Merge branch 'master' of https://github.com/scuellar/COS510
I hope this merges properly
Who knows if this works