ignore jpgs
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	masp/.idea/workspace.xml
	masp/maspNew/Scripts/controller.gallery.js
	masp/maspNew/Scripts/module.masparti.js
	masp/maspNew/gallery.html
	masp/maspNew/home.html
	masp/maspNew/index.html
kostickovac