first git
Merge branch 'master' of github.com:icemilk0122/gsteam

Conflicts:
	.gitignore