new modules for my strong diamond system
reverting change (hopefully)
Merge branch 'newmodules' into jeff-francesca
merge