commits before pull
commit before merge
cleaning up after pull
added .DS_Store