Create .travis.yml
triggering travis
Merge branch 'master' of github.com:BoiseFED/device-registry
updating package.json
Update README.md


initial commit
initial commit
fixing weird git merge issue
fixing weird git merge issue