Fix inner join bullshit
Merge branch 'master' of github.com:mcafeeryan92/codegoggles

Conflicts:
	public/index.html