Initial commit to add default .gitIgnore and .gitAttribute files.
Added it all
Fixed merge conflicts