Fix swim.
Merge branch 'master' of github.com:iChun/TwitchPlays

Conflicts:
	src/main/java/us/ichun/mods/twitchplays/client/task/TaskRegistry.java