readme
Merge branch 'master' of https://github.com/ktmtwm/TES-codeship

Conflicts:
	README.md