initial
Merge branch 'master' of https://github.com/bchiatt/gp-virus-game into dennis
Merge branch 'liza' of https://github.com/bchiatt/gp-virus-game into dennis
main Ctrl
added Fighter controller
set pixel width of fighter
assets in JS
added canvas class
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
adding game.js
preparing to merge branches
Merge branch 'shruti' of https://github.com/bchiatt/gp-virus-game into brian
Merge branch 'liza' of https://github.com/bchiatt/gp-virus-game into brian
Merge branch 'dennis' of https://github.com/bchiatt/gp-virus-game into brian
merged branches
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