Added scene switching and a fake scene in scene2
Reconciled conflicts, removed debug call