Added hm2/1
fixing
Publicando la noticia "7cb5741df004e9f16d3275075e8ec847" que ha mandado munoz.roberto@gmail.com automagicamente
fixed gul/7cb5741df004e9f16d3275075e8ec847
Added hm/28
Updated hm/28
Added hm/hobbit
Added hobbit2
Merge branch 'master' of https://github.com/voiser/gul-web into new_update

Conflicts:
	css/general.css
	stories/hm/28
	stories/timeline