lets conflict
Merge branch 'master' of http://github.com/poofytoo/nextres

Conflicts:
	nrd/app.js
	nrd/routes/checkout.js