Initial Commit
resolve conflicts for gitignore