current location through standard
Merge branch 'master' of github.com:marius-nyxpoint/Flighty

Conflicts:
	index.html