Add a bunch of code
Accepting Laura's changes; merging with my code
Merge pull request #2 from kourosh/master

Add a bunch of code