trying to use localstorage
add .DS-Store to gitignore
merging conflicts