small change to font
fixed merges
Merge branch 'gh-pages'
added video link in readme