change
footer
afooter
afooter
footer
fix conflicts
Merge pull request #12 from CodeRunners14/maryam

change