Updated, added fonts.
Merge branch 'master' of https://github.com/mpei/awesome-window-manager-configuration

Conflicts:
	rc.lua