using a .im js now
just changing this for now
some changes
some changes
some changes
some changes
some changes
some changes
some changes
Merge pull request #96 from jjliang/umass_branch

Umass branch
Merge branch 'umass_branch' into staging
Merge pull request #102 from jjliang/umass_branch

Umass branch
Merge branch 'umass_branch' into staging
minor changes to fix errors
Merge pull request #103 from jjliang/staging

Staging