Added classes for different views.
solved conflic.

Conflicts:
	js/intro.js