[project initial commit]
Merge branch 'master' of https://github.com/gabrielsr/bomberman

Conflicts:
	README.md