Erich Fixes
Merge origin/master

Conflicts:
	home.html
Merge origin/master

Conflicts:
	home.html