Hello world
Merge branch 'roee' of github.com:hershko764/iCompany into roig

Conflicts:
	README.md
Merge branch 'roee' of github.com:hershko765/iCompany into roig
Merge branch 'roee' of github.com:hershko765/iCompany into roig
Merge branch 'roee' of github.com:hershko765/iCompany into roig
Hello world 1
Added entity employee!
Merge branch 'roig' of github.com:hershko765/iCompany into roee
Added employee conditions table