Create nu-file.txt
fix issues
Merge branch 'master' into part1_task2

Conflicts:
	index.html
Merge branch 'part1_task2'