check
Mela
rge branch 'master' of github.com:paulovillani/camprulho
:wq

fsdfsdfsf

Conflicts:
	portal/static/css/portal_base.css