added nina sprites, started drawing diego sprites
Merge branch 'master' into Art_Implementation

Conflicts:
	src/Ball.as
Ball behaviour uses overlap instead of collide to minimize weirdness w player getting pushed by ball. Ball bounces in the urn
Merge branch 'Art_Implementation'

Conflicts:
	src/PlayState.as
merged art and ball behaviors into master. Ball bounces / uses overlap