Merge branch 'master' into week-2-dev
ajax xml load fixed

it now saves correctly, but it does not load correctly.
xml fixed

it loads, it saves, it displays!
Merge branch 'week-2-dev'
Merge branch 'master' into gh-pages