fix conflicts
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages
added keydown left & right
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages