bug fix:wq
Merge branch 'master' of github.com:bgirard/ToJAM2013
fix end game bug
Merge branch 'master' of github.com:bgirard/ToJAM2013