Merge pull request #77 from Nienhaus/master

Energy Pistol
Colored couch corners

Added the north-east and north-west corners of the colored couches.