fixed @jpro awful merge
fixed @jpro awful merge

djbielejeski/bunker,JoshHarris/bunker,pbrejcha/bunker,alexandergmann/bunker,weegeekps/bunker,DigitalZebra/bunker,bunkerchat/bunker,pbrejcha/bunker,weegeekps/bunker,depinav/bunker,DigitalZebra/bunker,johnculviner/bunker,alexandergmann/bunker,johnculviner/bunker,JoshHarris/bunker,djbielejeski/bunker,depinav/bunker,bunkerchat/bunker