DancefloorOverlay Progress Bar
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git

Conflicts:
	src/overlay/DancefloorOverlay.java
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git