add mario
Merge remote-tracking branch 'origin/master'

* origin/master:
  finish up
  sweet_dream
Merge branch 'master' into gh-pages