Initial commit.
Merge master branch with Github.

Conflicts:
	.gitignore