yeah
msg
Merge branch 'master' of git://github.com/lambdaloop/bomberman
Merge branch 'master' of https://github.com/lambdaloop/bomberman

Conflicts:
	menu.py
Merge branch 'master' of git://github.com/lambdaloop/bomberman
Updated readme