added lightbulb
lightbulb
lightbulb asset
Merge remote-tracking branch 'origin/lightbulb'

Conflicts:
	script/app.js