index jquery fix
Merge branch 'master' of https://github.com/danielj86/Dev4DevHackaton

Conflicts:
	public/js/index.js