• Merging conflict 2

    @farodin91
    farodin91 committed Aug 4, 2015
    4557a5d