Update .gitignore
Update .gitignore
Added missing files

Git does not forgive. Git does not forget.
Update .gitignore
Updated .gitignore
Fixed .gitignore
Merge branch 'master' of https://github.com/Figglewatts/yoloscape
Deleted unmergable files
Merge branch 'master' of github.com:Half-Shot/yoloscape

Conflicts:
	.gitignore

	modified:   .gitignore
	Client/bin/client.class.orig