Location Search added
Merge branch 'master' of https://github.com/Babbafett/the_art_of_fap

Conflicts:
	javascript/fap_script.js