Initial Commit
add .ignore
add gitignore
fix conflict