git initial
git initial
Merge branch 'master' of https://github.com/elfeck/Ephemeral.git

Conflicts:
	.gitignore