Added initial setup code
Merge

Conflicts:
	.gitignore