update
Merge branch 'master' of https://github.com/stuber/test

Conflicts:
	README.txt