adding footer
adding footer
fixed merge conflicts
Merge branch 'Alejandra-test' of github.com:dustyp/solutions into mikes-branch