Initial check-in.
Initial check-in continuation
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore