Newspaper
Merge branch 'master' of git@github.com:cristianapredoiu/fun_tracker.git

Conflicts:
	Gui/src/Newspaper.java
Merge branch 'master' of git@github.com:cristianapredoiu/fun_tracker.git
Am adaugat clasa Eveniment