footer changes
merged diff files for the first time
clean up git files, still new to this
bring up to date