test2
Merge branch 'master' of ssh://git@github.com/Tondar/FriendOrFoe.git

Conflicts:
	TODO