deleted layout files
Merge branch 'master' of http://github.com/fmazon3/dotfiles
lua.def is backup
Conflicts:
	config/awesome/rc.lua.def