INITIAL
Merge remote-tracking branch 'origin/master3'

Conflicts:
	.gitignore