Merge branch 'master' of github.com:ups100/TIN into markubik
Getting latest update
trying...
Merge branch 'markubik' of github.com:ups100/TIN
Updating command parser
update
Merge branch 'master' of github.com:ups100/TIN into Kj
ommiting .hidden temporary file DAEMON_CONFIG_FILE