merging with Skylars master
Merge branch 'master' of github.com:mromrell/address-book
Fixed bug on the server/server.js file