Added variable that does things
Merge pull request #1 from mklemme/master

Added variable that does things
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
Added my BS to your BS