xxxx
Merge branch 'master' of github.com:felixr/awesome-config

Conflicts:
	apps.lua
	keys.lua