Add fil
Merge branch 'master' of https://github.com/ludvigsj/gitkurs
Merge branch 'master' of https://github.com/ludvigsj/gitkurs

Conflicts:
	fil.txt