initial git commit
Merge branch 'master' of https://github.com/davidmam/DMAP