Improved node7
Merge branch 'master' of github.com:tdhulster/js-mvc-presentation

Conflicts:
	css/niels.css