added credit card and address management
Solved conflicts in app.js and server.js