Initialize repository
Merge https://github.com/bathhousegit/proj0

Conflicts:
	.gitignore
Merge https://github.com/bathhousegit/proj0

Conflicts:
	.gitignore