Small things that should be overridden by Oskar
Merge branch 'master' of github.com:raksooo/BouncingBalls

Conflicts:
	src/BouncingBallsModel.java
Merge branch 'master' of github.com:raksooo/BouncingBalls