dsd
Merge branch 'gh-pages' of https://github.com/pecopong/pecotype into gh-pages

Conflicts:
css/style.css
index.html
js/main.js
asd