gitignore
Merge branch 'master' of https://github.com/AlexanderBasyrov/Satan

Conflicts:
	.idea/satan.iml
	.idea/workspace.xml
sample add