a totally new version!

RT
Merge branch 'master' of https://github.com/vinci7/vinci7.github.io

Conflicts:
main.json
Merge branch 'master' of https://github.com/vinci7/vinci7.github.io