Merge pull request #31 from esteinborn/master

Master to Craig
Notes n stuff
Merge branch 'Craig'

Conflicts:
	index.html
Merge pull request #37 from esteinborn/Craig

Craigs stuff
Merge pull request #38 from esteinborn/master

It updates the pages or else it gets the hose again.