dsstore
fixed ds store
saving ds sotre
 saving xproj
fixed merge conflicts
saving
saving ds store
fixed issues
Merge branch 'master' of github.com:rschneid0/reversePolarity