add user and offer api
Merge branch 'master' of https://github.com/robertcao/CMPE275_Project2

Conflicts:
	app/routes.js

Change-Id: I4631f331095f4e3a43a902e29e44270224ec67f8