Merge remote-tracking branch 'origin/GRAPHICS' into Skeleton

Conflicts:
Merge remote-tracking branch 'origin/GRAPHICS' into Skeleton
added bonus class
fixed merging issues
Merge remote-tracking branch 'origin/GRAPHICS' into Skeleton
fixed score stuff
switched order of operations
merge issues
merging issues part 4
nothing
merging issues part 5