Updates
Merge branch 'master' of https://github.com/pczech/docs.git

Conflicts:
	linux/drives.txt