Para plates
Merge branch 'master' of github.com:neurotic/hba_theme

Conflicts:
	css/carlos.css