Added first puzzle for intro...
Merge fix, cleaned up some stuff, removed test scene code.