Initial commit
modified .gitignore
fix conflicts