initial commit
Merge commit '676a05c5038a82a7033282c3ae255298850a7d77'

Conflicts:
	.gitignore