pushing so I can pull
Merge branch 'master' of https://github.com/cloutier116/Dog-Game