Merge pull request #1 from mortlake/feature

feature1
by mac
.gitignore added
merged by mjp