stuff
merge
fix fd:/
make player template, closes #26