Adding gitignore file.
Fixing conflicts..
Everything!