Merge pull request #7 from jennywen/jenny

merging
Merge pull request #8 from jennywen/jenny

omg names!