commiting my update and delete
Merge branch 'master' of https://github.com/terencechu2012/testingjinq

Conflicts:
	nodetest1/views/userlist.jade