take of jade
changes
changes
Merge branch 'master' of https://github.com/guilhermedecampo/elaine
server changes