Managepy executable
Renamed /media > /static
Better Settings
Merge Conflicts