commit
Merge branch 'master' of https://github.com/danielmroczka/node.js-app

Conflicts:
	public/partials/list.html