edited style
Merge branch 'master' of https://github.com/Babbafett/the_art_of_fap

Conflicts:
	html/locationSearch.html
edited footer
Merge branch 'master' of https://github.com/Babbafett/the_art_of_fap