Project 2: intermediate commit
Merge branch 'master' of https://github.com/derio/Java-Projects

Conflicts:
	2/BlockBreaker/src/Animate.java
	2/BlockBreaker/src/BlockBreakerPanel.java