Added correct main page structure.
fixed conflict.

Conflicts:
	js/intro.js