Start .gitignore
Update .gitignore
Add Project Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore