merge conflicts
fixed merge conflict
virusJS
Merge branch 'liza' of https://github.com/bchiatt/gp-virus-game into shruti
index and asset
conflict resolved
res folder for android
icon and splashscreen
Merge branch 'master' of https://github.com/bchiatt/gp-virus-game