No conflicts pls
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	server/logs/errors.log