date...
Merge branch 'master' of git://github.com/kupto/public

Conflicts:
	README.txt