good stuff

yeaaa
Merge branch 'master' of https://github.com/MyPlanetFruitloops/JitteryJoes

Conflicts:
	Final/final.html