first commit
Merge branch 'master' of https://github.com/Shujito/SandBox.git

Conflicts:
	.gitignore

	fixing