test for merge fail
Merge branch 'master' of https://github.com/killalau/BombermanOnline

Conflicts:
	csci4140/web/index.html