Update local.xml
fixing issue with gitignore file
pushing eric dev work
Merge pull request #5 from ktsweb1/master

Eric Dev Push
more Eric updates... yay.
Merge pull request #7 from ktsweb1/master

More Eric Updates
fixed local.xml confilct