initial commit
initial commit
Merge branch 'fleshing_it_out' of github.com:BoiseFED/device-registry into fleshing_it_out

Conflicts:
	Gruntfile.js
	public/css/main.css
	public/js/device-collection.js
	public/js/device-model.js
	public/js/header-view.js
	public/js/main.js
	public/templates/header.hbs
fixing weird git merge issue
fixing weird git merge issue
Merge branch 'fleshing_it_out' of github.com:BoiseFED/device-registry into fleshing_it_out
updaing server and config
Merge branch 'fleshing_it_out' of github.com:BoiseFED/device-registry into fleshing_it_out

Conflicts:
	README.md