published website
Merge pull request #1 from ErinJoan/master

published website