make it so ties dont crash
Merge branch 'master' of https://github.com/hannawii/cs221project
getting fanhals stuff