Init
Merging
Merge branch 'master' of https://github.com/nonzod/gasisland

Conflicts:
	.gitignore