adding in basesprite, forgot to add earlier
Merge branch 'staging' into unfinished
Merge branch 'staging' into unfinished
Merge branch 'staging' into unfinished
Added setPos
Merge branch 'unfinished' into staging
Merge branch 'unfinished' into staging