ourg log files
Merge branch 'master' of https://github.com/DesignPond/plugin_arrets

Conflicts:
	logs/log.txt
updates from live