Framework test
Moved things around for github.io
Merge branch 'master' of https://github.com/psiroki/psiroki.github.io