added: change_password route and email syntax checker
merge conflict fixed from adding email and pass req.
committing to test Travis
fixed JShint errors
removed / from heroku url in user_test
changed url to Mark's app in user_test
changing master branch to mark's app
Merge remote-tracking branch 'upstream/dev' into dev
Merge remote-tracking branch 'upstream/dev' into dev
added change phone route
merge conflict - server.js
Merge pull request #14 from Chareesa/dev

merge conflict - server.js had added route
upstream