.
Merge branch 'master' of https://github.com/ArnauPrat/Sacman

Conflicts:
	build/config.ini
Merge branch 'master' of https://github.com/ArnauPrat/Sacman

Conflicts:
	build/config.ini
Merge branch 'master' of https://github.com/ArnauPrat/Sacman

Conflicts:
	build/config.ini
added config
Merge branch 'master' of https://github.com/ArnauPrat/Sacman
Fixed log include