partial edit
undid partial damage
desc
correctly tabbed code
merge conflicts resolved
Merge pull request #46 from catherinev/random

Random