First git commit
Merge commit 'c62df6b698a77558bdeb65dabd3b64a322437481'

Conflicts:
	.gitignore