ini commit
Merge branch 'master' of https://github.com/lockys/lockys.github.io