Moved to ember for website.
Resolved conflicts.

Conflicts:
	index.html