Sample database integration
Merge branch 'master' of https://github.com/programMint/NoteTakr

Conflicts:
	app.js
	views/index.jade