this is a test
Merge remote-tracking branch 'origin/master' into test
edit Field.java and Layout.java
Merge remote-tracking branch 'origin/layout' into test
methods constructor, getter, setter
test for layout
changed methods names
something fails
Merge remote-tracking branch 'origin/test' into layout
added Test
Merge remote-tracking branch 'origin/master' into user
user simplified + test