added .DS_Store to .gitignore
store mode in sessionStorage instead of localStorage
fixed conflict