New
Merge branch 'master' of https://github.com/Ditwoo/Bomberman

Conflicts:
	Bomberman.pro.user
	mainwindow.cpp