Removed server log from repo
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	server/log.txt