First commit
Merge gitignore problem