#39, also fixed issue where escape didn't work on EnterName
Merge branch 'master' of github.com:liam-m/PlanePeril