consolidation of tanners and my changes

mostly unfucked things, but can’t quite get move from splash to landing
to flow right, and if I put a photo there everything is terrible and
nothing is great.
Merge branch 'master' of https://github.com/tannerdactyl/pierogi-wars

Conflicts:
	index.html