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
}

@@ -212,11 +212,30 @@
 st git%0D%0A
+%09//test conflicts%0D%0A
 %7D%0D%0A

test conficts from work