added new lights
Merge branch 'master' of https://github.com/savaki/homie

Conflicts:
	public/stylesheets/style.css