Initial commit.
Merge commit '92341f711991bbd3aa7ff03a35a92968af28c674'

Conflicts:
	.gitignore
Cleaning merge problems.