new index file
Updated image urls so they will display
Updated merge conflict