Initial commit
version 1.1
Create .gitignore
upload
version 1.1
version 1.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
my
my
upload
	modified:   my-gdx-game-android/assets/data/texture.png
upload
Merge branch 'master' of https://github.com/krille0x7c2/Lab2-software-ing
Merge branch 'master' of
https://github.com/krille0x7c2/software-ing-project