new project, test for git
Merge branch 'temp'

Conflicts:
	.gitignore