Add .gitignore
Add support for comments
Fix merge