Initial Commit
Initial commit
Updated gitignore file
Fixed conflicts in gitignore file