Adding external link to 2012 confenrence in Navigation bar
Merge branch 'master' of github.com:openkratio/okioconf14

* 'master' of github.com:openkratio/okioconf14:
  Ajustando parrilla
  Añadendo a Miguel Ongil a la mesa 3