use spaces instead of tabs
Merge branch 'master' of github.com:valerinistor/awesome

Conflicts:
	config.lua