initial code commit
[resolve] .gitignore conflicts