porting to express3
Merge branch 'master' of github.com:HackBerkeley/habitat
fixed weird syntax error