Michael Jackson
Merge branch 'master' of https://github.com/AlexandreK88/BubbleEater

Conflicts:
	BubbleEater/src/InGameShapeManager.java