Add file .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/encodings.xml
	.idea/vcs.xml
	temp/function1.py
Add file .gitignore