Second commit
Merge branch 'master' of github.com:lotaris/git-workshop-5

Conflicts:
	soulevay.txt