edit activity roundtrip.
Merge branch 'master' of https://github.com/pconner03/CS4261-8803-Spring-2014---Family-Unplugged