Redesign.
gitignore.
Merge branch 'ml'

* ml:
  Redesign.

Conflicts:
	.gitignore