public gitignore
merged master