first commit
add gitignore
Merge commit 'e50e22a47d6ff3320cd441e97eb09d7b7259d664'

Conflicts:
	.gitignore