update package json
merge
Merge branch 'dev' of github.com:aredo/travelingking into dev
Merge branch 'dev' of github.com:aredo/travelingking into dev
Merge branch 'dev' of github.com:aredo/travelingking into dev
Merge branch 'dev' of github.com:aredo/travelingking into dev
API, get all users, single user
Merge branch 'dev' of github.com:aredo/travelingking into dev
fixing route API