add
Merge branch 'master' of https://github.com/igax/my-settings

Conflicts:
	FFXIV.cfg
	FFXIVLogRep2/data/FFXIVLogRep_env.xml
	FFXIVLogRep2/data/FFXIVLogRep_view.dat
	FFXIVLogRep2/data/err.log
	FFXIV_CHR0040000001CB3FE1/ADDON.DAT
	FFXIV_CHR0040000001CB3FE1/GEARSET.DAT
	FFXIV_CHR0040000001CB3FE1/HOTBAR.DAT
	FFXIV_CHR0040000001CB3FE1/log/00000000.log
	FFXIV_CHR0040000001CB3FE1/log/00000001.log
	FFXIV_CHR0040000001CB3FE1/log/00000002.log
	downloads/ffxivpatch/4e9a232b/patch/D2013.11.26.0000.0001.patch.info