changes
error fix
resources.json added
conflicts
conflicts again
Footer updated
Footer updated