added content to page
Merge remote-tracking branch 'origin/effed-up'

Conflicts:
	index.html
Accepted changed from effed-up