new spaceBar Images / storageActive started
Merge branch 'master' of ssh://git@github.com/superduali/ClappyBit.git

Conflicts:
	ClappyBit/.settings/org.eclipse.core.resources.prefs
	ClappyBit/src/ClappyBit/GUI/SideBar.java