master: Added main method.
master: Added int x = 5
featurea: Added double z = 7.5
master: added String g