update
fix merge coflict
update
Merge branch 'gh-pages' of github.com:ArtTora/site into gh-pages