Player works, dumbest bug ever
updated sources and images
ugh
Merged changes. Sean, merging is *SO* much easier now, but whoever edited test.js last time still hasn't made merging easy :(