package gr.sperfect.djuqbox.webapp.shared.data;

public class User extends BaseDataClass {

	public User() {
		// json needed
	}
	public User(String aName) {
		super("User "+ aName);
		
	}
	
	
	//test git
}

package gr.sperfect.djuqbox.webapp.shared.data;

public class User extends BaseDataClass {

	public User() {
		// json needed
	}
	public User(String aName) {
		super("User "+ aName);
		
	}
	
	
	//test git
	//test conflicts
}

test conficts from work