initial commit
fixed merge issue with gitignore