backup
Merge branch 'master' of github.com:kaka768/mylinux

Conflicts:
	.config/Trolltech.conf
	.config/compiz/compizconfig/Default.ini
	.config/deadbeef/config