With separation between h and c files
Merge branch 'master' of https://github.com/okland/OmriTomer

Conflicts:
	ex3/ex3/Diary.cpp
	ex3/ex3/Diary.h