almost done research
Merge branch 'master' of https://github.com/vfseanm/giri_site
finished research
small changes
finished research