first commit
Merge branch 'master' into temp1

* master:
  first commit

Conflicts:
	.gitignore