midchanges
merged
Merge branch 'master' of https://github.com/Sense-of-Right-Alliance/OrcaJam2013
lotsa stuff
merging
fixed merge
Merge pull request #11 from mike1072/master

lots of stuff