Updates README
Merge branch 'master' of github.com:czambel2/lp73-tp

Conflicts:
	README.md