Merge branch 'gh-pages' of https://github.com/malecki/edav into gh-pages
Trying to keep my local copy current?
intro / hw0 blogpost
Fixes get-pop, creates a new directory for my things
JiunKim_Project_iter1
Merge branch 'my-blogpost' into gh-pages
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Fixes get-data.py, begins json modifications
Merge branch 'gh-pages' of https://github.com/bhtucker/edav into gh-pages
updated projects with Katherine
rebased changes from upstream
Sprint 2 plan

Added a plan for my sprint 2
FWC - sprint2 update
merge
Revised blogpost1 and added assets
Changed link to picture
Push unpublished changes-- mostly just style stuff
Create iteration1 post, clean up some things
undo .gitignore changes
undo .gitignore changes
Iteration 2 plan