Merge branch 'class' of https://github.com/kiquenet85/Legis2013