adapt front page for Jacob's performance
Merge branch 'master' of github.com:100hours/lws

* 'master' of github.com:100hours/lws:
  Add gemma's selection back in
  update joe photo
  add joe's pages

Conflicts:
	app/views/pages/_on_air.html.haml