forced to commit
Merge branch 'master' of https://github.com/partyhopper/PartyHopper

Conflicts:
	PartyHopper/src/com/partyhopper/partyhopper/Globals.java
blah