better
Merge branch 'master' of https://github.com/digitaldesigndj/starrydex-models

Conflicts:
	Player.js
merge