Merge pull request #258 from ThePyrotechnic/Dev

small logical error
Rebel car shop 2.0
Merge pull request #259 from cl0ck/dev

Rebel car shop 2.0
Cured robShops of autism.