modified file
Merge branch 'master' of https://github.com/kimluther18/exercise1

Conflicts:
	ss.txt