Merge pull request #2 from bengui/pre-production

Pre production
Merge branch 'pre-production'
Merge remote-tracking branch 'upstream/pre-production'
Cambios css home head
Merge branch 'pre-production'
Merge remote-tracking branch 'upstream/pre-production'

Conflicts:
	views/includes/head.jade
Merge branch 'master' of https://github.com/bengui/giombu
Cambios css head
cambios head
Merge remote-tracking branch 'upstream/pre-production'

Conflicts:
	views/includes/head.jade
Cambios
Conflicts:
	views/includes/head.jade
Merge branch 'master' of https://github.com/bengui/giombu
Cambios css home
Merge remote-tracking branch 'upstream/pre-production'

Conflicts:
	views/users/create.jade
cambios create.jade
 Please enter the commit message for your changes. Lines starting
Merge branch 'pre-production'