w
Merge branch 'master' of https://github.com/stomicic/WinDays

Conflicts:
	server.js