turret
Merge branch 'master' of github.com:themitch/remcovsmitchel

Conflicts:
	remcovsmitchel-lib/src/com/prutsers/remcovsmitchel/game/models/Champion.java