we

we
Merge branch 'master' into newbrach

resolved conflict
df

df
Merge branch 'master' of https://github.com/victorcassone/Enumtesting into newbrach

Conflicts:
	bin/Dogs.class
	src/Dogs.java
we

we
wewewe

wewewew