Finished fixes to type_rules.
Merge branch 'master' of github.com:tmagrino/cs6113-project