Added kitt.ini stuff
Revert main.c to my version.
Merge branch 'master' into kitty