more things
more things
Merge branch 'master' of https://github.com/Frostlag/GJ

Conflicts:
	GJ-csharp.sln
	GJ.sln