This is a squashed commit

commit 17cabc577d57abad1048bf4dab7ae7d028019ce9
Author: Gustavo Medina <gus.a.medina@gmail.com>
Date:   Thu Dec 11 21:40:17 2014 -0500

    lol

commit 356cccb523d0d72e4958a811f75be162a7aef871
Author: Gustavo Medina <gus.a.medina@gmail.com>
Date:   Thu Dec 11 21:40:05 2014 -0500

    mdslfamd