2556
Merge remote-tracking branch 'origin/master'

Conflicts:
	Arkanoid.sdf
	Arkanoid.v12.suo
Merge branch 'master' of https://github.com/EmptyOne/Boomberman2

Conflicts:
	Arkanoid.sdf
	Arkanoid.v12.suo
Merge branch 'master' of https://github.com/EmptyOne/Boomberman2