5th test
Merge branch 'master' of https://github.com/killalau/BombermanOnline

Conflicts:
	index/index.php