console
Merge branch 'master' of github.com:waxerdima/node

Conflicts:
	app/models/presentation.js
uncomment article
Merge pull request #1 from cale148/master

some sweets