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

Conflicts:
	.gitignore
	public/css/styles.css
	test/unit/controllerSpec.js