test max_min
new readme
error again

Merge branch 'master' of https://github.com/hly89/Timma

Conflicts:
	README.md