yepp is now something else
aaa
Maybe handled

Merge branch 'master' of https://github.com/viktorlindgren/Test

# By Viktor Lindgren (1) and viktorlindgren (1)
# Via viktorlindgren
* 'master' of https://github.com/viktorlindgren/Test:
  From git do conflict
  yepp

Conflicts:
	textfile.txt