commit1
Merge branch 'master' of https://github.com/gluckspilz/TrueCrypt

Conflicts:
	README.md