First commit after png conflict

Reloaded directory from backup