convert file
Merge branch 'master' of github.com:mvanlonden/trackAndMap
Merge branch 'master' of github.com:mvanlonden/trackAndMap