few changes
Merge branch 'master' of https://github.com/nl79/is217hw3

Conflicts:
	routes/is217hw3.js