Fixed indentation
Copied to static
Resolve conflict

Conflicts:
	custom.css