29_10_2013
Merge branch 'master' of https://github.com/mauriciorj/blog_v2