???
what
sdg\
Merge branch 'master' of https://github.com/georgethedan/georgethedan.github.io

Conflicts:
	ios7.html