Hog: fixed GUI bug and added timeout
Merge branch 'master' of https://github.com/papajohn/61a-fa13-website