Added an Introduction.
Resolved some conflicts