initial commit
add gitignore
Merge commit 'b9c3e0473655a258b46287847395bb1c3afd80fc'

Conflicts:
	.gitignore