Initial commit
Merge branch 'master' into github-master

Conflicts:
	.gitignore