Merge pull request #1 from mr/master

Added a script to generate a JOSM file
Started merge.py