---
Merging
cleaned workspace
----
Merge branch 'master' of git@github.com:Valep42/JBreakout.git

Conflicts:
	bin/.gitignore