Merge branch 'week-2-dev'
Merge branch 'week-2-dev'
Merge branch 'gh-pages'
Merge branch 'week-2-dev'
Merge branch 'master' into gh-pages
not sure

not sure what this commit is
Merge branch 'gh-pages'
json loaded, xml not so much
Merge branch 'master' into week-2-dev