Merge branch 'master' into JoeBranch
Merge remote-tracking branch 'origin/master' into JoeBranch
more realistic ai
Merge branch 'JoeBranch'
start music
Merge branch 'briansbr'
reset
Merge branch 'briansbr' of https://github.com/nabulator/BrickBreaker.git
into briansbr

Conflicts:
	Fjoejoe/TestingStuff/demoscene/Circle.java
	Fjoejoe/TestingStuff/demoscene/Main.java
	Fjoejoe/TestingStuff/demoscene/Metaballs.java