Finished majority of find matches

Created config.php to hold database information
Created ability to generate JSON markers through SQL
Can now grab markers fronm the generated JSON using ajax
Merge branch 'master' into leon

Conflicts:
	JS/main.js
	index.php
Merged everything together.
Merge branch 'leon'