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
skdasdasd 4
merge
Merge tag '0.0.4' into develop

tagging with 0.0.4
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
bumped version
Merge branch 'release/0.0.5'