Merge branch 'Tim's-Branch' of https://github.com/pkrulik/DTTSPK2 into Tim's-Branch

Conflicts:
	yo.js