first commit
Merge branch 'master' of https://github.com/metzuda/consolation

Conflicts:
	.gitignore