big site update
Merge branch 'master' of https://github.com/Shomari/shomari.github.io