- goodbye
Merge branch 'branchXisbranch1' of https://github.com/tjeger/hippofriday into branchXisbranch1

Conflicts:
	file2.txt