Added frame and made joke
Merge branch 'Joseph'

Conflicts:
	index.html