Merge branch 'master' of https://github.com/pawjanssen/javascript_training

Conflicts:
	server/rest-api/todoRoutes.js