add simpleDB
Merge branch 'master' of https://github.com/anweiqi/CloudProject

Conflicts:
	server/package.json
	server/server.js
Merge branch 'master' of https://github.com/anweiqi/CloudProject
simpleDB and API
Merge branch 'master' of https://github.com/anweiqi/CloudProject

Conflicts:
	server/Controllers/S3Controller.js
	server/server.js