started generalize
Merge branch 'master' of github.com:alkjash/cs153
Fixed a ton of bugs