Updated Logs
Merge branch 'master' of https://github.com/noelboss/NodeShooter

Conflicts:
	server.js