Added separate component names.
Merge branch 'master' of github.com:garrettvparrish/OttoPieneRobotControls

Conflicts:
	layout.js
Fixed some files.