mac commit
Merge branch 'master' of https://github.com/celestinbasura/DiplomskiBasura

Conflicts:
	build/intermediates/model_data.bin