animation tonneau
Merge branch 'master' of https://github.com/jmcomets/gamerush3-team
waves
Merge branch 'master' of https://github.com/jmcomets/gamerush3-team

Conflicts:
	res/levels/king-kraken.lvl