Fixin some stuffs. Dont remember what i did lolz
Merge branch 'master' of https://github.com/thedrick/PartyStarter