committing again, merging all day long
Merge branch 'master' of https://github.com/Sense-of-Right-Alliance/OrcaJam2013
How did this even...
Fixed the naming on the boat images

Oh god I hope this doesn't conflict.
Merge pull request #21 from leafdj/master

Fixed the boat naming