updates after edit
update after edit
updating content after edit
updates after edit
Fixing some merge weirdness.
merge conflict in sample.
Unstaging unintended edits via commit.
More unstaging unintended edits.
Merge pull request #312 from rackerlabs/constanzeWorking

Constanze working