Added files/
Modified .gitignore
Merge branch 'master' of baristas:public_html