homework03
Merge branch 'master' of https://github.com/stuckata/javascript-basics

Conflicts:
	javascript-basics