css-y styled
fixed conflicts
Merge branch 'gh-pages' of https://github.com/iumehara/flashy into gh-pages