changes
Merge branch 'master' of github.com:tiy-chs-q4-fee/buck.it
changes
removed ds store
Merge pull request #8 from natalie03/master

removed ds store
resolved merge conflict