testing
.ds_store file for my macbook.
Merge pull request #1 from rolipoly/master

testing pull requests and making jia do another git pull for no raisin.