Added .gitignore
More ignored files
Initial files added
Fix conflict