first commit to git for mars
Merge branch 'master' of https://github.com/jimmida/mars