something
Merge branch 'master' of github.com:kanpe777/gitdojo2 into jineq

Conflicts:
	README.md