Elaine:Marcos:Pedro:Antonio | Refactoring
Merge branch 'master' of https://github.com/marcosamaris/labxp2014