initial commit
fixed merge on .gitignore