Initial check-in
Adding .gitignore
updating version
Resolving conflict