12/3
Merge branch 'master' of https://github.com/Saronet/Mindcet-startups-site

Conflicts:
	wp-content/themes/mindcet-Theme/js/mindcet.js