added progress ring around user's plane; added quarter-assed implementation of sprite refactor
Merge branch 'master' of https://github.com/joshjung/skyduel

Conflicts:
	shared/js/Player.js