Login Fix
Merge branch 'master' of github.com:Babbafett/the_art_of_fap

Conflicts:
	html/setMyLocation.html