first commit
Merge branch 'master' of github.com:qwerw2/gb

Conflicts:
	.gitignore