added int g
added double t
Added string e from Github
Added int z.
Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	egit1/src/egit1/egit1.java
Change line endings in settings in Windows.