nothing is changed
merge conflicts
add game javascript file
refactor board
Merge remote-tracking branch 'upstream/master'
commit change before pull
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
create function for pacman to lose life if pacman touches ghost without powerup
Merge pull request #36 from juljun14/master

create function for pacman to lose life if pacman touches ghost without powerup
Merge pull request #37 from rootulp/master

oojs chat.js
Revert "create function for pacman to lose life if pacman touches ghost without powerup"
Merge pull request #38 from red-spotted-newts-2014/revert-36-master

Revert "create function for pacman to lose life if pacman touches ghost ...
function for kill
create function for pacman kill
Merge pull request #39 from dabeeya/master

create function to kill pacman