Added Lamps
Merge remote-tracking branch 'origin/Iron's-Area'
Merge branch 'master' of https://github.com/ironhammer354/MagiTech