Edit README on computer
Merge branch 'master' of https://github.com/christophekunesh/homework1

Conflicts:
	README