See readme.md for changelog
Merge branch 'master' of https://github.com/aDroidman/Thomas

Conflicts:
	readme.md