DS_Store
fixed merge conflict
fixed merge conflict
fixed merge conflict
fixed merge conflict
Updates to site
fixed merge conflicts
Merge pull request #3 from dfminnojr/Sharif

Sharif