initial
Merge branch 'brian' of https://github.com/bchiatt/gp-virus-game into d22
merge conflicts
merge conflicts again
merge conflicts again
blahh
added splash pages and icons
pulling down splashcreen
added splash and icon folders
pulling splashscreen
Merge branch 'liza' of https://github.com/bchiatt/gp-virus-game into brian
fixed merge conflict
Merge branch 'liza' of https://github.com/bchiatt/gp-virus-game into shruti
do not merge
merged group work and added text display during game
do not merge
added crit mass bar
pulling down critical mass bar
Merge branch 'd22' of https://github.com/bchiatt/gp-virus-game into brian
working on crit mass meter