First test, gitignore added
Merge