Better heuristic
Merge branch 'master' of https://github.com/skleung/cs221