modified gitignore to ignore log files (e.g. from ADR server)

Conflicts:
	.gitignore
Merge branch 'fixing_units' of https://github.com/martinisgroup/servers into fixing_units