Merge branch 'gh-pages' of https://github.com/malecki/edav into gh-pages
Trying to keep my local copy current?
intro / hw0 blogpost
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.
Merge branch 'gh-pages' of https://github.com/bhtucker/edav into gh-pages
iteration 2
iteration 2 edited
iteration plan
iteration
Iteration 2 plan for Vivian
Added Stephen's Blog Post 2
Proofing of blog post 2 (and renaming)
Merge branch 'gh-pages' of https://github.com/malecki/edav into gh-pages
updating local copy
Blogpost modified
add project sprint3 and assets for project
merging branches
updating asset links
merging branches
changed directory for assests