merged dan and karen branch
working
Merge pull request #8 from Kereru2014Sharpies/dan2

final version