stuff
merged
Merge branch 'master' of github.com:Butsco/partylando
it works!