changes made
resolved conflicts
Merge branch 'master' of github.com:songty/dom-challenges
made toggle show and hidden work