test commit
Merge branch 'mywork'

Conflicts:
	src/Test.java
test 3
Merge branch 'mywork'
Update Test.java
Merge pull request #1 from yaronadar/master

Update Test.java
testtest
Update Test.java
some set up
Merge branch 'master' into mywork