Updated Read Me
Updated Read Me
Add the new FlashDevelop generated stuff.
Use --ours in merge conflict, update xml