main hello world added
test
Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/karigeir/Skil1

Conflicts:
	movies.txt.txt