To merge
DS_Store banished
test
add gitignore
resolve conflict