finished my story
Merge branch 'master' of https://github.com/jodyHamilton/devcamptesting