Merge branch 'shruti' of https://github.com/bchiatt/gp-virus-game into liza
Merge branch 'dennis' of https://github.com/bchiatt/gp-virus-game into liza
Merge branch 'master' of https://github.com/bchiatt/gp-virus-game into liza
added button margin
pulling changes
Merge branch 'liza' of https://github.com/bchiatt/gp-virus-game
game creating, touches registering