first commit
first time
delete some data
X
qMerge https://github.com/Tizianol8/shame

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Tizianol8/shame

Testing git