Volume control is now working and difficulty handler is in place awaiting implementation.

May change the difficulty system to use an enum and will likely create
a custom volume control component.
Merge branch 'master' of https://github.com/sjlbos/SENG271-GroupProject

Conflicts:
	src/controller/Controller.java