newest
Merge branch 'master' of https://github.com/maxHartman/maxHartman.github.io

Conflicts:
	newjavascript.js