kraken git commit res/animations/kraken/Kraken1-arms.png res/animations/kraken/*git commit res/animations/kraken/Kraken1-arms.png res/animations/kraken/*
kraken git status!
Merge branch 'master' of https://github.com/jmcomets/gamerush3-team

Conflicts:
	res/levels/test.lvl
	res/levels/test5.lvl
	src/tropicalescape/HitboxAnimation.java