final version for today
Merge pull request #2 from woolly-bear-caterpillars-2014/view_edit

final version for today