some text
added some text
merged in testing branch
I made a website\!
started making footer changes
Hotfix Complete
Finished footer changes
fixed merge conflicts