new structure.
Merge branch 'master' of github.com:thoughtram/example-app

* 'master' of github.com:thoughtram/example-app:
  added another amazing joke
  adds site of the day