Multiple changes :P
Merge branch 'master' of https://github.com/limeroot/seed

Conflicts:
	etc/ld.so.cache
	var/cache/ldconfig/aux-cache
	var/log/apt/history.log
	var/log/apt/term.log
	var/log/dpkg.log

Other modification