update content
Merge branch 'gh-pages' of https://github.com/scrazybabycom/website into gh-pages