Merge branch 'master' into admin
removed some debug logging
Merge branch 'master' into admin
added control for whether players can lose lives

see #70, #21
Merge branch 'admin'