commit
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git

Conflicts:
	src/gool/generator/objc/ObjcGenerator.java
commit
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git
commit
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git

Conflicts:
	src/gool/GOOLCompiler.java
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git

Conflicts:
	src/gool/methods/objc/string.method
String.method objc
Merge branch 'master' of https://github.com/NiubiTeam/GOOL.git
String.method objc