fixed timeout from 300 to 30 seconds
Merge branch 'master' of https://github.com/acm-uiuc/mm19