Initial Commit
First commit
GitIgnore
Merge commit 'fb1c1b24c01805d92f839ba4b6954f87b66325fa'

Conflicts:
	.gitignore