Not sure of the changes I made
Changes from remote merged
Got my file names corrected
Got my file names corrected