some notes
adding notes and humor
Merge branch 'master' into eric

Conflicts:
	index.html
Merge branch 'eric'

Conflicts:
	index.html