Generacion en rails y agregado/haml/sass
waaaa!
Merge branch 'master' of https://github.com/creevc/Iknelia