some stuff merp
merging?
Merge branch 'master' of github.com:thedrick/PartyStarter
fixins