update
Merge branch 'master' into newb
Outline html updated
Merge pull request #60 from ffmegaman/newb

Newb