Commiting
Merge branch 'master' of https://github.com/TamaraAtanasoska/ClubCloud

Conflicts:
	favorites.json