Merge branch 'master' of github.com:ups100/TIN into Kj
ommiting .hidden temporary file DAEMON_CONFIG_FILE