Merge pull request #9 from phphants/staging

Staging
Added content to when/where on index
Added information page