Create .gitignore
Create Files.
Update Files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore