Added gitignore
Added UI stuff
Merge conflict resolved in .gitignore