add file 3 from develop
Merge branch 'develop' of github.com:kineretamor/kineretTest into branch1
change file 2 from develop
change 2 from branch1