fixing weird git merge issue
Merge branch 'fleshing_it_out' of github.com:BoiseFED/device-registry into fleshing_it_out