fixed merging conflicts
set up media folder