Merge pull request #105 from Austinh100/master

setup fix mainly
Merge pull request #1 from acm-uiuc/master

Merge pull request #105 from Austinh100/master