Accidentally removed line in merge resolution.
Merge branch 'master' of github.com:jeresig/god-game