Added Internet troll content
Merge remote-tracking branch 'origin/master'

Conflicts:
	nav-template.html