Merging
Merge branch 'master' of github.com:Dorvaryn/zerozeroduck
Wave generation for patates
Merge branch 'master' of github.com:Dorvaryn/zerozeroduck

Conflicts:
	zerozeroduck/src/fr/odai/zerozeroduck/model/World.java