feature for lol2

commit d21845ec6050ee1572fe9ae28a980f8373c3cea6
Author: Gustavo Medina <gus.a.medina@gmail.com>
Date:   Thu Dec 11 21:45:59 2014 -0500

    lol12

commit 8c5213365bcf4dbef53ee2f3f012db739f4cf662
Author: Gustavo Medina <gus.a.medina@gmail.com>
Date:   Thu Dec 11 21:45:45 2014 -0500

    adslfadslfs