styling
Merge branch 'dev'

Conflicts:
	balzac/css/i.css