changes
Merge branch 'master' of https://github.com/leknarf/loadcanary

Conflicts:
	server.js