3rd commit
change
Merge Conflict Resolve
Changes
Navbar and Footer with Links