file restructure
Merge branch 'master' of https://github.com/gringogidget/Gringogidget

Conflicts:
	index.html