max was here
Merge branch 'min' of github.com:marothon/tutorial into min

Conflicts:
	README.md