Test
New update
Merge branch 'master' of https://github.com/truce76/FranzyColis

Conflicts:
	FranzyColis.v11.suo