First commit
Fixed gitignore
First merge