gitignore the local.xml
local.xml
Merge branch 'master' of https://github.com/earthlinkdesign/iworldonline

Conflicts:
	.gitignore