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

Conflicts:
	rc.lua
Merge branch 'master' of github.com:tusj/awesome-config

Conflicts:
	rc.lua