First commit from gitk. Added line in test7.txt
Merge branch 'master' of https://github.com/swag-kaust/swag-repo

Conflicts:
	user/tzivanc/test7.txt