First commit
Fixed gitignore conflict. First push to repo