form for adding device css
Merge branch 'master' into add-device-form

Conflicts:
	public/scss/main.scss
Merge pull request #7 from BoiseFED/add-device-form

form for adding device css