Merge branch 'master' into Adam-Jones
Merge branch 'master' into Adam-Jones
photo & notes section corrected

also horizotal rule fixes and other visual isssues
Merge branch 'Adam-Jones'
Merge branch 'Dustin'
Merge branch 'master' into Dustin