test
Merge branch 'gh-pages' of https://github.com/gustavorayo/HTMLExercises into gh-pages

Conflicts:
	Others/location/index.html