add todo solution
Merge branch 'master' of https://github.com/tibbon/WDI_Summer_Public
Merge remote-tracking branch 'upstream/master'