almost last
Merge branch 'master' of https://github.com/MissCatLady/CSC309

Conflicts:
	views/games.jade
	views/scavenger.jade
	web.js