Needed more penis
Merge branch 'master' of github.com:Beerclub/Fikt
Fixed conflict
Conflicts:
	einar.txt