Merge branch 'master' into english

diff --combined haunt.scm
index 2051f6c80d01aa057a1402732a9fcb7223d550ad,09bf58d941383d34cbcc1f858189995a71e482c0..c178dd69e6855794793258795872ef8146261850
--- 1/haunt.scm
--- 2/haunt.scm
+++ b/haunt.scm
@@@ -49,6 -49,10 +49,10 @@@
                                     `(li (a (@ (href ,(cdr page))) ,(car page))))
                                   (assoc-ref metadata 'pages))))
                       (ul (@ (class "social"))
+                          (li (a (@ (class "sc-bitbucket") (target "_blank") (href "https://bitbucket.org/jsancho_gpl/")) (i (@ (class "fa fa-bitbucket")))))
+                          " "
+                          (li (a (@ (class "sc-github") (target "_blank") (href "https://github.com/jsancho-gpl")) (i (@ (class "fa fa-github")))))
+                          " "
                           (li (a (@ (class "sc-twitter") (target "_blank") (href "https://twitter.com/jsancho_gpl")) (i (@ (class "fa fa-twitter")))))
                           " "
                           (li (a (@ (class "sc-rss") (target "_blank") (href "feed.xml")) (i (@ (class "fa fa-rss")))))))))
@@@ -104,13 -108,7 +108,13 @@@
    (static-page
     "About me"
     "about.html"
 -   `((h2 "hi."))))
 +   `((div
 +      (article
 +       (header (h2 "About me"))
 +       (p "I met GNU/Linux and free software while I was studying Computer Science at " (a (@ (href "http://www.uji.es/")) "Universitat Jaume I") " and, since then, my commitment with these ideas hasn't stopped growing.")
 +       (p "It was in 2003 when I started as an activist, participating in events related with free software, demonstrations against software patents, talks and information sessions at install parties, schools, etc.")
 +       (p "I enjoy programming and I use the programming language that better fits my needs (Python, PHP, Golang, Erlang, ...). For many years my favorite language was C, although over time that privileged place has been occupied by Lisp y Scheme. I'm in love with the functional paradigm.")
 +       (p "I'm married with a wonderful woman and we have a kid that amaze us every day. They are the best of my life."))))))
  
  (define %collections
    `(("Home" "index.html" ,posts/reverse-chronological)))