First commit.
Update .gitignore file.
Merge branch 'refs/heads/temp1'

Conflicts:
	.gitignore