Things
Merge branch 'master' of https://github.com/KillerSmurf/JukeAlert

Conflicts:
	src/com/untamedears/JukeAlert/JukeAlert.java
Fixed conflicts