Added fonts
Changed css
Merge branch 'master' of https://github.com/Competa-IT/social-media-dashboard-xmas-2014

Conflicts:
	app/sass/style.css.map