smoother player animations
fix merge conflict
Merge pull request #7 from cremalab/mp-movement

Multiplayer Avatar Movement
Merge branch 'master' into player-names

Conflicts:
	app/models/player.coffee
	app/views/styles/avatar.styl