Initial commit to add default .gitIgnore and .gitAttribute files.
first commit
second commit
merging conflict