i need to pull
Merge branch 'master' of https://github.com/HumberGer/FrenchFryHeroes2

Conflicts:
	ApocalyptalHeroes_Data/output_log.txt
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt