updated strike
updated beginning
merging
reverting two.js
Merge branch 'gh-pages'