finishe generator declarations
Merge branch 'master' of https://github.com/acada001/cs152proj