discarding extraneous whitespace
Merge branch 'master' into newmodules
Merge pull request #5 from jyutzler/newmodules

discarding extraneous whitespace
Merge pull request #6 from jyutzler/newmodules

Merge branch 'master' into newmodules
Merge branch 'master' into jeff-donna
discarding extraneous whitespace
Getting rid of Grand Slam Force