Merge pull request #155 from nickpassarella/master

this isn't a demo day commit.
vegetarian
Merge pull request #156 from deedeelavinder/master

vegetarian