merged intro
Merged my old intro file