1.0
First
Add pg
Add pg
Update
Update 2
Update 3
Update 4
Add ejs
Update 5
Update 6
Idea
Merge branch 'master' of github.com:thanhtam4692/cloudappdemo

Conflicts:
	app.js

node_modules/jade/node_modules/constantinople/node_modules/uglify-js/nod
e_modules/source-map/package.json

node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_
modules/source-map/node_modules/amdefine/package.json

node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_
modules/source-map/package.json

node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/
source-map/package.json
	node_modules/pg/build/Release/binding.node
	node_modules/pg/node_modules/nan/package.json
	node_modules/pg/node_modules/pgpass/node_modules/split/package.json
	node_modules/pg/package.json
	routes/index.js
	routes/user.js
	views/index.jade