CSS, add font stacks and hacks
Merge branch 'master' of https://github.com/shanti-uva/drupal_shanti_theme

Conflicts:
	templates/html.tpl.php